bitkeeper revision 1.217 (3eba1d1aDFDJBD7-4CxJgolbh-GlMA)

Merge with IAP's extra args

diff --cc tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java
index 3181515df549eb0d10125d16b16de7e3ce203a27,ca051fb16c668b0f6dd9f1637784b861aa7a4f58..915f0f1c920a634fd73e590c5c7354d51e3d6a73
--- 1/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java
--- 2/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java
+++ b/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/CommandNew.java
@@@ -13,7 -13,7 +13,7 @@@ public class CommandNew extends Comman
      String image = getStringParameter(args, 'i', d.domainImage);
      String initrd = getStringParameter (args, 'r', d.domainInitRD);
      int vifs = getIntParameter(args, 'v', d.domainVIFs);
-     String bargs = getStringParameter (args, 'a', d.args);
 -    String bargs = getStringParameter (args, 'a', "") + " ";
++    String bargs = getStringParameter (args, 'a', d.args) + " ";
      String root_dev = getStringParameter (args, 'd', d.rootDevice);
      String nfs_root_path = getStringParameter (args, 'f', d.NWNFSRoot);
      String nw_ip = getStringParameter (args, '4', d.NWIP);

diff --cc tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java
index d30e941e5acd071b697672e254e4e2fa6e4986ae,6019cd150ff482216e309682503289b3eda959d2..5ce360a5adebd35b400e237500f5d3203499b295
--- 1/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java
--- 2/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java
+++ b/tools/domctl/src/uk/ac/cam/cl/xeno/domctl/Defaults.java
@@@ -24,9 -24,7 +24,8 @@@ public class Default
    String NWNFSServer;
    String NWNFSRoot;
  
-   int MaxDomainNumber;
- 
+   int MaxDomainNumber = Integer.MAX_VALUE;
 +  String args = "";
  
    String XIToolsDir;
  
@@@ -52,22 -49,23 +50,24 @@@
        e.printStackTrace();
        System.exit(1);
        }
+   }
  
+   public void describe () {
      System.out.println ("Domain defaults:");
-     System.out.println ("   name        " + domainName);
-     System.out.println ("   size        " + domainSizeKB);
-     System.out.println ("   vifs        " + domainVIFs);
-     System.out.println ("   domainImage " + domainImage);
-     System.out.println ("   domainInitRD " + domainInitRD);
-     System.out.println ("   rootDevice " + rootDevice);
-     System.out.println ("   NWIP " + NWIP);
-     System.out.println ("   NWGW " + NWGW);
-     System.out.println ("   NWMask " + NWMask);
+     System.out.println ("   name            " + domainName);
+     System.out.println ("   size            " + domainSizeKB);
+     System.out.println ("   vifs            " + domainVIFs);
+     System.out.println ("   domainImage     " + domainImage);
+     System.out.println ("   domainInitRD    " + domainInitRD);
+     System.out.println ("   rootDevice      " + rootDevice);
+     System.out.println ("   NWIP            " + NWIP);
+     System.out.println ("   NWGW            " + NWGW);
+     System.out.println ("   NWMask          " + NWMask);
      System.out.println ("   MaxDomainNumber " + MaxDomainNumber);
-     System.out.println ("   NWNFSServer " + NWNFSServer);
-     System.out.println ("   NWNFSRoot " + NWNFSRoot);
-     System.out.println ("   XIToolsDir " + XIToolsDir);
-     System.out.println ("   args " + args);
+     System.out.println ("   NWNFSServer     " + NWNFSServer);
+     System.out.println ("   NWNFSRoot       " + NWNFSRoot);
+     System.out.println ("   XIToolsDir      " + XIToolsDir);
++    System.out.println ("   args            " + args);
    }
  
    /***********************************************************************/